auto merge of #555 : alexcrichton/cargo/issue-215, r=brson

author bors <bors@rust-lang.org>

Thu, 11 Sep 2014 21:28:53 +0000 (21:28 +0000)

committer bors <bors@rust-lang.org>

Thu, 11 Sep 2014 21:28:53 +0000 (21:28 +0000)
author bors <bors@rust-lang.org>
Thu, 11 Sep 2014 21:28:53 +0000 (21:28 +0000)
committer bors <bors@rust-lang.org>
Thu, 11 Sep 2014 21:28:53 +0000 (21:28 +0000)
diff --cc tests/test_cargo_bench.rs
Simple merge
diff --cc tests/test_cargo_test.rs
Simple merge
author	bors <bors@rust-lang.org>
	Thu, 11 Sep 2014 21:28:53 +0000 (21:28 +0000)
committer	bors <bors@rust-lang.org>
	Thu, 11 Sep 2014 21:28:53 +0000 (21:28 +0000)
		1	2
tests/test_cargo_bench.rs	patch \|	diff1 \|	diff2 \|	blob \| history
tests/test_cargo_test.rs	patch \|	diff1 \|	diff2 \|	blob \| history